Update VS 2008 support to use ATK-2.0

-Update GTK+ project and property sheet to use ATK-2.0.
-Tell people about this in the README.txt file

diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt
index e84424aadf63039426c87490c5dc4d1b74ca2231..86baa6f778b228621015339260e387ff91ed4961 100644 (file)
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -7,7 +7,7 @@ the files needed, like config.h.win32.in into config.h.win32 and the
 .vcprojin files here into corresponding actual .vcproj files.\r
 \r
 You will need the parts from below in the GTK+ stack: GDK-Pixbuf, Pango,\r
-ATK and GLib.  External dependencies are at least Cairo\r
+ATK (2.x) and GLib.  External dependencies are at least Cairo\r
 (with Cairo-GObject support, meaning Cairo 1.10.x or later), zlib, libpng,\r
 gettext-runtime, fontconfig*, freetype*, expat*.  See the \r
 build/win32/vs9/README.txt file in glib for details where to unpack them.\r

diff --git a/build/win32/vs9/gtk+.vsprops b/build/win32/vs9/gtk+.vsprops
index 591b8925635b6446c2ae32a80ceaace09a835bcb..60b5205e2e99fccb61ff64123dd0602793c9564e 100644 (file)
--- a/build/win32/vs9/gtk+.vsprops
+++ b/build/win32/vs9/gtk+.vsprops
@@ -8,7 +8,7 @@
        >\r
        <Tool\r
                Name="VCCLCompilerTool"\r
-               AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"\r
+               AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\atk-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0"\r
                PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_DEPRECATED;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES"\r
                ForcedIncludeFiles="msvc_recommended_pragmas.h"\r
        />\r

diff --git a/build/win32/vs9/gtk.vcprojin b/build/win32/vs9/gtk.vcprojin
index 7f38614e7b81c4176484ad0ab3e77479bb69730e..6508a713aa643e798a53c750d91626e46ac56bb7 100644 (file)
--- a/build/win32/vs9/gtk.vcprojin
+++ b/build/win32/vs9/gtk.vcprojin
@@ -42,7 +42,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
@@ -72,7 +72,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
@@ -107,7 +107,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r
@@ -137,7 +137,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="atk-1.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
+                               AdditionalDependencies="atk-2.0.lib pangowin32-1.0.lib imm32.lib winspool.lib comctl32.lib"\r
                                OutputFile="$(OutDir)\$(GtkDllPrefix)$(ProjectName)-win32$(GtkDllSuffix).dll"\r
                                LinkIncremental="2"\r
                                ModuleDefinitionFile="$(IntDir)\gtk.def"\r